Remove gtk_menu_button_[sg]et_menu

These functions were never in a stable release, and have
been renamed to gtk_menu_button_[sg]et_popup.

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 84229b6be7d521a9e458ab702e26fc63edf8b3f7..577f22950786f99927b3141e5c35654471f56b7a 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -1564,14 +1564,12 @@ gtk_menu_bar_set_child_pack_direction
 gtk_menu_bar_set_pack_direction
 gtk_menu_button_get_align_widget
 gtk_menu_button_get_direction
-gtk_menu_button_get_menu
 gtk_menu_button_get_menu_model
 gtk_menu_button_get_popup
 gtk_menu_button_get_type
 gtk_menu_button_new
 gtk_menu_button_set_align_widget
 gtk_menu_button_set_direction
-gtk_menu_button_set_menu
 gtk_menu_button_set_menu_model
 gtk_menu_button_set_popup
 gtk_menu_detach

diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 168ac9b2bc5322162b7cee67fc74ef501569e6bb..b46dd3a4ffdc58ce3b4c40477fe4d21c68092db0 100644 (file)
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -747,19 +747,6 @@ gtk_menu_button_get_popup (GtkMenuButton *menu_button)
   return GTK_MENU (menu_button->priv->popup);
 }
 
-void
-gtk_menu_button_set_menu (GtkMenuButton *menu_button,
-                          GtkWidget     *menu)
-{
-  gtk_menu_button_set_popup (menu_button, menu);
-}
-
-GtkMenu *
-gtk_menu_button_get_menu (GtkMenuButton *menu_button)
-{
-  return gtk_menu_button_get_popup (menu_button);
-}
-
 /**
  * gtk_menu_button_set_menu_model:
  * @menu_button: a #GtkMenuButton

diff --git a/gtk/gtkmenubutton.h b/gtk/gtkmenubutton.h
index 24fc5d8e1fea3417dbe0b3d9c7fbf21007998b1f..67c67c9a07a86a8bb811d275d192c96de83a85de 100644 (file)
--- a/gtk/gtkmenubutton.h
+++ b/gtk/gtkmenubutton.h
@@ -71,12 +71,6 @@ void         gtk_menu_button_set_popup      (GtkMenuButton *menu_button,
 GDK_AVAILABLE_IN_3_6
 GtkMenu     *gtk_menu_button_get_popup      (GtkMenuButton *menu_button);
 
-GDK_DEPRECATED_IN_3_6_FOR(gtk_menu_button_set_popup)
-void         gtk_menu_button_set_menu       (GtkMenuButton *menu_button,
-                                             GtkWidget     *menu);
-GDK_DEPRECATED_IN_3_6_FOR(gtk_menu_button_get_popup)
-GtkMenu     *gtk_menu_button_get_menu       (GtkMenuButton *menu_button);
-
 GDK_AVAILABLE_IN_3_6
 void         gtk_menu_button_set_direction  (GtkMenuButton *menu_button,
                                              GtkArrowType   direction);